From b54bec07894eac84aec8ec4af6c80d0bee448136 Mon Sep 17 00:00:00 2001 From: "mjw@wray-m-3.hpl.hp.com" Date: Thu, 8 Jul 2004 12:49:34 +0000 Subject: [PATCH] bitkeeper revision 1.1053 (40ed42de9JFsw0T591T5jpnZ82grCw) Quieten down debug and errors. --- tools/python/xen/xend/XendClient.py | 5 +++- tools/python/xen/xend/XendDomain.py | 2 +- tools/python/xen/xend/XendDomainInfo.py | 2 +- tools/python/xen/xend/XendMigrate.py | 2 +- tools/python/xen/xend/server/SrvBase.py | 2 +- tools/python/xen/xend/server/SrvDaemon.py | 2 +- tools/python/xen/xend/server/SrvDomainDir.py | 4 +-- tools/python/xen/xend/server/blkif.py | 2 +- tools/python/xen/xend/server/controller.py | 2 +- tools/python/xen/xend/server/netif.py | 2 +- tools/python/xen/xm/create.py | 28 +++++++++++++------- 11 files changed, 32 insertions(+), 21 deletions(-) diff --git a/tools/python/xen/xend/XendClient.py b/tools/python/xen/xend/XendClient.py index b09412894b..f85c462cf5 100644 --- a/tools/python/xen/xend/XendClient.py +++ b/tools/python/xen/xend/XendClient.py @@ -19,6 +19,9 @@ import PrettyPrint DEBUG = 0 +class XendError(RuntimeError): + pass + class Foo(httplib.HTTPResponse): def begin(self): @@ -118,7 +121,7 @@ def xend_request(url, method, data=None): if resp.status in [204, 404]: return None if resp.status not in [200, 201, 202, 203]: - raise RuntimeError(resp.reason) + raise XendError(resp.reason) pin = sxp.Parser() data = resp.read() if DEBUG: print "***data" , data diff --git a/tools/python/xen/xend/XendDomain.py b/tools/python/xen/xend/XendDomain.py index c908fda5ab..385c1dc390 100644 --- a/tools/python/xen/xend/XendDomain.py +++ b/tools/python/xen/xend/XendDomain.py @@ -8,7 +8,7 @@ import sys import traceback from twisted.internet import defer -defer.Deferred.debug = 1 +#defer.Deferred.debug = 1 from twisted.internet import reactor import xen.lowlevel.xc; xc = xen.lowlevel.xc.new() diff --git a/tools/python/xen/xend/XendDomainInfo.py b/tools/python/xen/xend/XendDomainInfo.py index 619d575466..5dff09e388 100644 --- a/tools/python/xen/xend/XendDomainInfo.py +++ b/tools/python/xen/xend/XendDomainInfo.py @@ -15,7 +15,7 @@ import sys import os from twisted.internet import defer -defer.Deferred.debug = 1 +#defer.Deferred.debug = 1 import xen.lowlevel.xc; xc = xen.lowlevel.xc.new() import xen.util.ip diff --git a/tools/python/xen/xend/XendMigrate.py b/tools/python/xen/xend/XendMigrate.py index 4d19a772ac..29cb4bb616 100644 --- a/tools/python/xen/xend/XendMigrate.py +++ b/tools/python/xen/xend/XendMigrate.py @@ -6,7 +6,7 @@ import time from twisted.internet import reactor from twisted.internet import defer -defer.Deferred.debug = 1 +#defer.Deferred.debug = 1 from twisted.internet.protocol import Protocol from twisted.internet.protocol import ClientFactory diff --git a/tools/python/xen/xend/server/SrvBase.py b/tools/python/xen/xend/server/SrvBase.py index 059220c408..6ea92ae6cc 100644 --- a/tools/python/xen/xend/server/SrvBase.py +++ b/tools/python/xen/xend/server/SrvBase.py @@ -8,7 +8,7 @@ import types import StringIO from twisted.internet import defer -defer.Deferred.debug = 1 +#defer.Deferred.debug = 1 from twisted.internet import reactor from twisted.web import error from twisted.web import resource diff --git a/tools/python/xen/xend/server/SrvDaemon.py b/tools/python/xen/xend/server/SrvDaemon.py index a514b89108..c4e562e711 100644 --- a/tools/python/xen/xend/server/SrvDaemon.py +++ b/tools/python/xen/xend/server/SrvDaemon.py @@ -23,7 +23,7 @@ from twisted.internet import reactor from twisted.internet import protocol from twisted.internet import abstract from twisted.internet import defer -defer.Deferred.debug = 1 +#defer.Deferred.debug = 1 from xen.lowlevel import xu diff --git a/tools/python/xen/xend/server/SrvDomainDir.py b/tools/python/xen/xend/server/SrvDomainDir.py index eb1521e117..719ea612ff 100644 --- a/tools/python/xen/xend/server/SrvDomainDir.py +++ b/tools/python/xen/xend/server/SrvDomainDir.py @@ -69,7 +69,7 @@ class SrvDomainDir(SrvDir): except Exception, ex: print 'op_create> Exception creating domain:' traceback.print_exc() - req.setResponseCode(http.BAD_REQUEST, "Error creating domain") + req.setResponseCode(http.BAD_REQUEST, "Error creating domain: " + str(ex)) return str(ex) #return error.ErrorPage(http.BAD_REQUEST, # "Error creating domain", @@ -100,7 +100,7 @@ class SrvDomainDir(SrvDir): """Callback to handle errors in deferred domain creation. """ print 'op_create> Deferred Exception creating domain:', err - req.setResponseCode(http.BAD_REQUEST, "Error creating domain") + req.setResponseCode(http.BAD_REQUEST, "Error creating domain: " + str(err)) return str(err) def op_restore(self, op, req): diff --git a/tools/python/xen/xend/server/blkif.py b/tools/python/xen/xend/server/blkif.py index bf51640ee1..a6ca8788d4 100755 --- a/tools/python/xen/xend/server/blkif.py +++ b/tools/python/xen/xend/server/blkif.py @@ -1,7 +1,7 @@ # Copyright (C) 2004 Mike Wray from twisted.internet import defer -defer.Deferred.debug = 1 +#defer.Deferred.debug = 1 from xen.xend import sxp from xen.xend import PrettyPrint diff --git a/tools/python/xen/xend/server/controller.py b/tools/python/xen/xend/server/controller.py index a9f416908a..d422cd2853 100755 --- a/tools/python/xen/xend/server/controller.py +++ b/tools/python/xen/xend/server/controller.py @@ -4,7 +4,7 @@ for a domain. """ from twisted.internet import defer -defer.Deferred.debug = 1 +#defer.Deferred.debug = 1 import channel from messages import msgTypeName, printMsg diff --git a/tools/python/xen/xend/server/netif.py b/tools/python/xen/xend/server/netif.py index 49f9865747..415ab2409b 100755 --- a/tools/python/xen/xend/server/netif.py +++ b/tools/python/xen/xend/server/netif.py @@ -3,7 +3,7 @@ import random from twisted.internet import defer -defer.Deferred.debug = 1 +#defer.Deferred.debug = 1 from xen.xend import sxp from xen.xend import PrettyPrint diff --git a/tools/python/xen/xm/create.py b/tools/python/xen/xm/create.py index 08773ea2f7..223a9f5602 100644 --- a/tools/python/xen/xm/create.py +++ b/tools/python/xen/xm/create.py @@ -7,7 +7,7 @@ import sys from xen.xend import sxp from xen.xend import PrettyPrint -from xen.xend.XendClient import server +from xen.xend.XendClient import server, XendError from xen.util import console_client @@ -352,13 +352,21 @@ def preprocess(opts, vals): def make_domain(opts, config): """Create, build and start a domain. - Returns: pair: [int] the ID of the new domain, [int] console port + + @param opts: options + @param config: configuration + @return: domain id, console port + @rtype: (int, int) """ - if opts.vals.load: - filename = os.path.abspath(opts.vals.load) - dominfo = server.xend_domain_restore(filename, config) - else: - dominfo = server.xend_domain_create(config) + + try: + if opts.vals.load: + filename = os.path.abspath(opts.vals.load) + dominfo = server.xend_domain_restore(filename, config) + else: + dominfo = server.xend_domain_create(config) + except XendError, ex: + opts.err(str(ex)) dom = int(sxp.child_value(dominfo, 'id')) console_info = sxp.child(dominfo, 'console') @@ -369,7 +377,7 @@ def make_domain(opts, config): if server.xend_domain_unpause(dom) < 0: server.xend_domain_destroy(dom) - opts.err("Failed to start domain %d" % dom) + opts.err("Failed to unpause domain %d" % dom) opts.info("Started domain %d, console on port %d" % (dom, console_port)) return (dom, console_port) @@ -397,9 +405,9 @@ def main(argv): if opts.vals.dryrun: PrettyPrint.prettyprint(config) else: - (d, c) = make_domain(opts, config) + (dom, console) = make_domain(opts, config) if opts.vals.console_autoconnect: - console_client.connect('localhost', c) + console_client.connect('localhost', console) if __name__ == '__main__': main(sys.argv) -- 2.30.2